Initial attempt at making it pretty