Initial commit, calc working but very rough