Just the skeleton code I finished from before

Have more to add later.