Assignment two working but might still need some tweaking