Initial commit; files need to be reworked