add some tests...FINAL COMMIT?!