Implement New Model (It's completely broke...)

doesn’t really fix #1