finished first pass at Basic Features