Got local stuff added and tested