First commit of (broken) code

will fix when time is mine.