Final additions, should all be working now