Now working! Though javadoc seems to have problems