Version 2

General updates and made it actually useful.