Add more stuff
Add more logic. Still need to change stuff around