Implemented angular and fixed a bunch of stuff.