Did some todo's and built skeleton of first part