1st commit, still bugs in the code