include bottle.py into the mix
started work on storage layer