i have it much much cleaner and will push the rebase soon