All stages functional

Still need some work though