Fixed string stuff for the list
Merge branch 'dev' of https://github.com/MitchelCabuloy/StormShed into dev
Refractored stuff. Bugs abound.
Merge branch 'dev' of https://github.com/MitchelCabuloy/StormShed into dev