Added Subscribe functionality, removed some crap