Commit today's work for now

- still not sure if the stem alignment is 100% right