Removed all callbacks, everything now synchronous