Attempts at making this more user friendly