V0.1.1

Work in progress for 0.1.1