Started cpp file, changed one header

More changes to come, test commit to see you're getting everything