gotta commit where I am at to switch over to v1.5 and finish testing