More api integration

Never merged this to master...

Api Integration and Bug Fixes