more progress
Working! Version 0.9