Cleaned up code and added fakes.