Commiting changes before moving to header
Working skeleton
more progress