completed more functions -> created more bugs -> fixed the bugs
testing input
resolved merge conflicts