Lots of changes

Next big update: Basic Model