tons of changes to make it more spigit like