First commit to Assignment5, still buggy and whatnot