started working on metro and added some tests
cleaning up build