Completed most of the base
Many bug fixes
More bug fixes
Added files