Remove test things
Update methods
Add modules