Making it a bit more functional. Still ugly