Move around
Tests and Javaification