Finished all logic; ready for UI  testing!