remodeled, starting up with views and what not
STUPID SWAP FILES