Added source files and kinda started pass 2