Mostly working I think, except alignment