Rev 4

Added more tests and stuff