Removed that ugly reflection and moved things into the factory!