still bug fixing like all hell