Removed testing code to start actual development