3 commits

Author	SHA1	Message	Date
gbrian	8efc5d7094	merge from remote	2021-03-29 11:03:25 +00:00
Craig	e4a554830d	slight changes, moved around a few things	2020-01-27 09:00:49 +00:00
Craig	7aa034f3ba	large refactor, fixes #2	2020-01-18 23:30:09 +00:00