Committed first very rough version of code