Basic code commit; still needs serious improvement