fleshed out weekly, added in columns