Majority of code written some more features to add and some small bugs to fix