Made several fixes and changes. Continuing development.
Trying to merge with the files in the new branch, keeping my edits.