Finished, all files working. Needs optimization