Merged and moved files
Added todos after meeting
merge