Finished all major features