Version 0.1: Added more functionality, made prettier