Use test instructions for now
Add debugging and locks
Remove unneeded methods since subclassing