Continuing work on this! More commits are a com in'!