first commit; hmm almost there but still buggy