* Work on indexing source
* Work on tests
* Refactor query count tests
* Unit test fixes
* Add some tests
* DAO fix
* Fix compile error
* Unit test fix
* Cleanup
* Test fix
* Fix compile error
* One more test fix
* This should be working now - need to check tests
* Add a changelog and some docs
* One more test fix
* Tests should be passing
* Fix compile
* Test fixes
* Ignore outdated DSTU2 validation test
* Start work on delta operations
* Add changelog
* Some build fixes
* Move upload terminology command to CodeSystem resource
* Updates
* Some test fixes
* Add changelog
* Some test fixes
* More test fixes
* Test fix
* Add additional tests
* Transaction boundary fixes
* Start working on cascading deleets
* WOrk on cascading deletes
* Work on cascading deletes
* Enable cascading deletes
* Cascade deletes almost working
* FIx test
* Test fix
* Initial consent svc
* Ongoing consent svc work
* Add docs
* Ongoing consent service work
* Work on consent service
* More work on consent svc
* License header updates
* Ongoing consent svc work
* Some test fixes
* Some test fixes
* More work on consent svc
* Tests working
* Test fix
* Propagate RequestDetails to everything in JPA server
* More interceptor tweaks
* Fix compile error
* One more tweak to captured SQL
* Ongoing interceptor tweaks
* Ongoing interceptor tweaks
* More interceptor tweaks
* Interceptor tweaks
* Tweaks to tests
* Fix tests
* Test fix
* Raise warnings when encoding extensions with missing values
* Consent service work
* More interceptor tweaks
* Consent interceptor tweaks
* Add logging to test
* Make IBundle list interface more flexible
* Make matchResourceLinks visible
* Make matchResourceLinks visible
* Pull in-memory matching functionality out of subscription module into dedicated classes in searchparam module
* Added more accessors to version independent resource classes
* improved forcedid matching (needs to be verified by James)
filter out nulls from HashMapProvider.searchAll() (hopefully no tests depend on this)
* add AnyComposition
* cleanup of Any classes
* create searchparam config so people can use that module without using subscriptions
* create searchparam config so people can use that module without using subscriptions
* fix broken test
* added derivedFrom
* renamed daoRegistry.getResourceDaoIfExists to getResourceDaoOrNull
also added method to add a new dao to the registry and retrieve registered types
* TokenParam.equals
* add error check to searchable hashmap resource provider
* added support for R4
* add successor to measure
* delete conflict hook
start with failing test
* test passes.
hook is called.
* added delete conflict hook
all delete conflict tests pass
* added javadoc
* Performance test
* test bad interceptor case
* typo
* rename criteria matcher
* added support for multiple topics
* fix method name
* add effective period
* Temporarily excluding StressTest from build to try to get Travis under time limit
* change log
* review feedback
* review feedback
* review feedback
* reported issue with proposed fix that breaks tests
* Fix spelling
* Merge my changes into this
* Correctly check referential integrity on deletes
* Add one more test
Squashed merge: Add elements exclude mode
* Start working on elements enhancement
* Work on elements projection
* Work on elements filter
* Feature is now working
* Just some cleanup
* Address compile issues
* Reorganizing packages and dependencies to support standalone subscription running within a CDR container where all hapi modules are on the classpath.
Moved Subscription registry out of interceptor and introduced SubscriptionLoader
* Created ActiveSubscription and moved cache bits into it
* Moved ExecutorQueue stuff out into its own class
* Add test and supporting code to validate SubscriptionConstants.EXT_SUBSCRIPTION_RESTHOOK_DELIVER_LATEST_VERSION behaviour
* Added SubscriptionCheckingSubscriber
* Moved a few beans to @ComponentScan
* Replaced use of beanFactory with concrete factory classes
* Switched test to use subscribablechannel
* Added SubscriptionLoaderFhirClientTest
* Confirm that our SubscriptionProviderFhirClient works with a live fhir client
* Register interceptors with DaoConfig instead of RestServer.
Also, Rename @VisibleForTesting methods with ForUnitTest
* Fix triggering service so it uses new subscriptionmatcherinterceptor
* Renamed "Database" classes to "Dao"
* processing -> matching naming change
* Validator fix
* Enhance AuthorizationInterceptor so that it tries to deny access earlier
for compartment searches that are outside the allowable compartment.
* FIx DSTU2 test that wasn't updated
* More test fixes
commit fa508e27b2
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Aug 14 20:38:12 2017 -0400
Fix android tests
commit dea567e960
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Aug 14 20:25:28 2017 -0400
Still trying to get tests passing
commit 6bbfec381f
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Aug 14 20:00:59 2017 -0400
Work on getting tests passing
commit 5e0a7672b7
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Aug 14 18:12:58 2017 -0400
Work on GraphQL integration
commit 1c88fd154d
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Aug 14 15:19:41 2017 -0400
Upgrade subscriptions to use interceptors across the board
commit de5c01c00d
Author: James <jamesagnew@gmail.com>
Date: Mon Aug 14 09:09:32 2017 -0400
Work on subscription
commit 387d504098
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Aug 14 06:19:25 2017 -0400
Work on subscriptions
commit 95a607d155
Merge: d851de7ffdb9dbd64101
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Aug 13 22:42:22 2017 -0400
Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor
commit d851de7ffd
Merge: 5413b276af209752cd63
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Aug 13 22:42:00 2017 -0400
Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor
commit b9dbd64101
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 22:40:35 2017 -0400
Work on subscriptions
commit 12f89a423a
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 14:38:51 2017 -0400
Minimize validation resources
commit f6868cce5c
Merge: 3b80779fd31e158311d8
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 14:05:34 2017 -0400
Forward port fix for #710
Merge branch 'master' into hapi3_refactor
commit 3b80779fd3
Merge: 1f534985e8356d9acaf7
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 12:31:09 2017 -0400
Forward port #705, #708, and #710
Merge branch 'master' into hapi3_refactor
commit 1f534985e8
Merge: 7c39a47852dedd3d635b
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 10:52:59 2017 -0400
Forward port #695
Merge branch 'master' into hapi3_refactor
commit 7c39a47852
Merge: e0ffb84d216efafe62f1
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 09:53:17 2017 -0400
Forward port #688
Merge branch 'master' into hapi3_refactor
commit e0ffb84d21
Merge: 52388c11c1d19b00ff09
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 12 14:59:46 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 52388c11c1
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 12 06:21:46 2017 -0400
Cleanup
commit 5413b276af
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Aug 10 11:36:25 2017 -0400
Work on graph QL support
commit 209752cd63
Author: James <jamesagnew@gmail.com>
Date: Thu Aug 10 11:18:19 2017 -0400
Fix tests
commit 4543408dc8
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 5 06:55:50 2017 -0400
Fix a potential deadlock
commit ee360f5376
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 5 06:22:06 2017 -0400
Add R4 code to CLI
commit 1a95ba3b65
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Aug 3 06:14:01 2017 -0400
More cleanup
commit f0d8802681
Author: James <jamesagnew@gmail.com>
Date: Wed Aug 2 11:27:43 2017 -0400
Tests are working!
commit a4cbda357e
Author: James Agnew <jamesagnew@gmail.com>
Date: Wed Aug 2 10:42:04 2017 -0400
Connection handling cleanup for new tests
commit 0e2cecfbd0
Author: James Agnew <jamesagnew@gmail.com>
Date: Wed Aug 2 10:16:28 2017 -0400
Clean up R4 JPA tests
commit 40317a650d
Author: James <jamesagnew@gmail.com>
Date: Wed Aug 2 09:12:38 2017 -0400
Work on R4 for JPA server
commit e7f8f8c30d
Author: James <jamesagnew@gmail.com>
Date: Tue Aug 1 20:43:47 2017 -0400
More work on porting tests
commit 43c9003258
Author: James <jamesagnew@gmail.com>
Date: Tue Aug 1 07:09:29 2017 -0400
Work on porting DSTU1 tests
commit 602857f1e2
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 22:34:08 2017 -0400
More work on bring unit tests up to date
commit e326a7b0cd
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 17:36:38 2017 -0400
Credit for #686 and forward port the fix to R4 validator
commit 96543c3992
Merge: 3fb75aa61a9901b802c4
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 17:12:33 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 3fb75aa61a
Author: James <jamesagnew@gmail.com>
Date: Mon Jul 31 15:21:30 2017 -0400
More work on cleanup
commit b02fbb6804
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 22:11:07 2017 -0400
Work on porting STU1 tests
commit 1ae37b0db3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 20:56:10 2017 -0400
Try to get coverage report working
commit 72b88849b3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 20:27:02 2017 -0400
Fix android tests
commit e5f6c35aea
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 19:31:18 2017 -0400
More work on getting legacy code cleaned up
commit 0b513b0845
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 18:41:13 2017 -0400
Continue work on removing deprecated API
commit defea69aa3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 17:10:01 2017 -0400
More cleanup of legacy code
commit 9ae7295705
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 07:11:45 2017 -0400
More cleanup of legacy code
commit ebd3eeb5ee
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 06:43:25 2017 -0400
More work on removing legacy code
commit 92224c2532
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 29 18:44:06 2017 -0400
Remove DSTU1 Bundle
commit c52cacf71b
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 29 14:27:42 2017 -0400
Now compiling
commit b405e51773
Merge: c3ddf04e25cb2cea54d7
Author: James Agnew <jamesagnew@gmail.com>
Date: Fri Jul 28 06:21:02 2017 -0400
Merge branch 'master' into hapi3_refactor
commit c3ddf04e25
Author: James <jamesagnew@gmail.com>
Date: Thu Jul 27 11:06:06 2017 -0400
Sync R4 releases in
commit b13333c3c0
Author: James <jamesagnew@gmail.com>
Date: Fri Jul 14 05:52:33 2017 -0400
JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions.
commit 2e60ff7521
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 20:02:46 2017 -0400
Fix imports
commit a92ace2e0d
Merge: 3196db96d11a6b3ea867
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 12:02:27 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 3196db96d1
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 11:48:10 2017 -0400
Don't add false paging link to request
commit bd4e1d3388
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 9 21:32:16 2017 -0400
Finally building correctly!
commit 6464ce9304
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 9 16:38:28 2017 -0400
Work on refactor
commit 0059f2e48e
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 8 07:16:20 2017 -0400
Keep working on refactor
commit 6c2e87e8cc
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 22:35:13 2017 -0400
Lots of work on refactor
commit 11cab97504
Merge: 34ec6b88076c47bd4c51
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 21:43:57 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 34ec6b8807
Merge: f8e647511bc520e60ac1
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 21:43:49 2017 -0400
Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor
commit f8e647511b
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 18:46:55 2017 -0400
Work on hapi3 changes
commit c520e60ac1
Author: James <jamesagnew@gmail.com>
Date: Wed Jul 5 08:08:40 2017 -0400
Keep working on refactor
commit f1d2ee9092
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 3 22:10:59 2017 -0400
Continue refactor for HAPI 3
commit 9281ccafc3
Merge: ea1264cd8e294d080bd3
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 3 20:34:16 2017 -0400
Merge branch 'master' into hapi3_refactor
commit ea1264cd8e
Author: James <jamesagnew@gmail.com>
Date: Wed Jun 28 10:26:01 2017 -0400
Continue work on refactor
commit fbe2f98a02
Merge: b2bef471000a4dcc32ec
Author: James <jamesagnew@gmail.com>
Date: Wed Jun 28 06:21:22 2017 -0400
Merge branch 'master' into hapi3_refactor
commit b2bef47100
Author: James <jamesagnew@gmail.com>
Date: Tue Jun 27 21:13:23 2017 -0400
Work on refactor
commit 8f76e4e463
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jun 25 21:55:35 2017 -0400
Lots of work on refactoring
Squashed commit of the following:
commit 12f89a423a
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 14:38:51 2017 -0400
Minimize validation resources
commit f6868cce5c
Merge: 3b80779fd31e158311d8
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 14:05:34 2017 -0400
Forward port fix for #710
Merge branch 'master' into hapi3_refactor
commit 3b80779fd3
Merge: 1f534985e8356d9acaf7
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 12:31:09 2017 -0400
Forward port #705, #708, and #710
Merge branch 'master' into hapi3_refactor
commit 1f534985e8
Merge: 7c39a47852dedd3d635b
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 10:52:59 2017 -0400
Forward port #695
Merge branch 'master' into hapi3_refactor
commit 7c39a47852
Merge: e0ffb84d216efafe62f1
Author: James <jamesagnew@gmail.com>
Date: Sun Aug 13 09:53:17 2017 -0400
Forward port #688
Merge branch 'master' into hapi3_refactor
commit e0ffb84d21
Merge: 52388c11c1d19b00ff09
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 12 14:59:46 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 52388c11c1
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 12 06:21:46 2017 -0400
Cleanup
commit 209752cd63
Author: James <jamesagnew@gmail.com>
Date: Thu Aug 10 11:18:19 2017 -0400
Fix tests
commit 4543408dc8
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 5 06:55:50 2017 -0400
Fix a potential deadlock
commit ee360f5376
Author: James <jamesagnew@gmail.com>
Date: Sat Aug 5 06:22:06 2017 -0400
Add R4 code to CLI
commit 1a95ba3b65
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Aug 3 06:14:01 2017 -0400
More cleanup
commit f0d8802681
Author: James <jamesagnew@gmail.com>
Date: Wed Aug 2 11:27:43 2017 -0400
Tests are working!
commit a4cbda357e
Author: James Agnew <jamesagnew@gmail.com>
Date: Wed Aug 2 10:42:04 2017 -0400
Connection handling cleanup for new tests
commit 0e2cecfbd0
Author: James Agnew <jamesagnew@gmail.com>
Date: Wed Aug 2 10:16:28 2017 -0400
Clean up R4 JPA tests
commit 40317a650d
Author: James <jamesagnew@gmail.com>
Date: Wed Aug 2 09:12:38 2017 -0400
Work on R4 for JPA server
commit e7f8f8c30d
Author: James <jamesagnew@gmail.com>
Date: Tue Aug 1 20:43:47 2017 -0400
More work on porting tests
commit 43c9003258
Author: James <jamesagnew@gmail.com>
Date: Tue Aug 1 07:09:29 2017 -0400
Work on porting DSTU1 tests
commit 602857f1e2
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 22:34:08 2017 -0400
More work on bring unit tests up to date
commit e326a7b0cd
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 17:36:38 2017 -0400
Credit for #686 and forward port the fix to R4 validator
commit 96543c3992
Merge: 3fb75aa61a9901b802c4
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 31 17:12:33 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 3fb75aa61a
Author: James <jamesagnew@gmail.com>
Date: Mon Jul 31 15:21:30 2017 -0400
More work on cleanup
commit b02fbb6804
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 22:11:07 2017 -0400
Work on porting STU1 tests
commit 1ae37b0db3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 20:56:10 2017 -0400
Try to get coverage report working
commit 72b88849b3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 20:27:02 2017 -0400
Fix android tests
commit e5f6c35aea
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 19:31:18 2017 -0400
More work on getting legacy code cleaned up
commit 0b513b0845
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 18:41:13 2017 -0400
Continue work on removing deprecated API
commit defea69aa3
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 17:10:01 2017 -0400
More cleanup of legacy code
commit 9ae7295705
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 30 07:11:45 2017 -0400
More cleanup of legacy code
commit ebd3eeb5ee
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jul 30 06:43:25 2017 -0400
More work on removing legacy code
commit 92224c2532
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 29 18:44:06 2017 -0400
Remove DSTU1 Bundle
commit c52cacf71b
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 29 14:27:42 2017 -0400
Now compiling
commit b405e51773
Merge: c3ddf04e25cb2cea54d7
Author: James Agnew <jamesagnew@gmail.com>
Date: Fri Jul 28 06:21:02 2017 -0400
Merge branch 'master' into hapi3_refactor
commit c3ddf04e25
Author: James <jamesagnew@gmail.com>
Date: Thu Jul 27 11:06:06 2017 -0400
Sync R4 releases in
commit b13333c3c0
Author: James <jamesagnew@gmail.com>
Date: Fri Jul 14 05:52:33 2017 -0400
JPA server is now able to handle placeholder IDs (e.g. urn:uuid:00....000) being used in Bundle.entry.request.url as a part of the conditional URL within transactions.
commit 2e60ff7521
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 20:02:46 2017 -0400
Fix imports
commit a92ace2e0d
Merge: 3196db96d11a6b3ea867
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 12:02:27 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 3196db96d1
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 13 11:48:10 2017 -0400
Don't add false paging link to request
commit bd4e1d3388
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 9 21:32:16 2017 -0400
Finally building correctly!
commit 6464ce9304
Author: James <jamesagnew@gmail.com>
Date: Sun Jul 9 16:38:28 2017 -0400
Work on refactor
commit 0059f2e48e
Author: James <jamesagnew@gmail.com>
Date: Sat Jul 8 07:16:20 2017 -0400
Keep working on refactor
commit 6c2e87e8cc
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 22:35:13 2017 -0400
Lots of work on refactor
commit 11cab97504
Merge: 34ec6b88076c47bd4c51
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 21:43:57 2017 -0400
Merge branch 'master' into hapi3_refactor
commit 34ec6b8807
Merge: f8e647511bc520e60ac1
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 21:43:49 2017 -0400
Merge branch 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor
commit f8e647511b
Author: James Agnew <jamesagnew@gmail.com>
Date: Thu Jul 6 18:46:55 2017 -0400
Work on hapi3 changes
commit c520e60ac1
Author: James <jamesagnew@gmail.com>
Date: Wed Jul 5 08:08:40 2017 -0400
Keep working on refactor
commit f1d2ee9092
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 3 22:10:59 2017 -0400
Continue refactor for HAPI 3
commit 9281ccafc3
Merge: ea1264cd8e294d080bd3
Author: James Agnew <jamesagnew@gmail.com>
Date: Mon Jul 3 20:34:16 2017 -0400
Merge branch 'master' into hapi3_refactor
commit ea1264cd8e
Author: James <jamesagnew@gmail.com>
Date: Wed Jun 28 10:26:01 2017 -0400
Continue work on refactor
commit fbe2f98a02
Merge: b2bef471000a4dcc32ec
Author: James <jamesagnew@gmail.com>
Date: Wed Jun 28 06:21:22 2017 -0400
Merge branch 'master' into hapi3_refactor
commit b2bef47100
Author: James <jamesagnew@gmail.com>
Date: Tue Jun 27 21:13:23 2017 -0400
Work on refactor
commit 8f76e4e463
Author: James Agnew <jamesagnew@gmail.com>
Date: Sun Jun 25 21:55:35 2017 -0400
Lots of work on refactoring