more features and it's time for a test