Finished for now! Think we'll look into adding canvas next