Ready for development

Files are tested, build-able, ready for development (second-half)