rewriting alot, just want to commit so i can have more meaningful commits