Final push for the day. Made small changes to implementation