Made some methods generic for testing purposes and commented out
DatabaseController for now because we can't find a good solution