updated all code to updated thinkster tutorial and kept it modular ;)