Features

Cleaned up features, just need to make sure Im doing something legit...
also moved testing code to other file to work on.